Use AM_PATH_PYTHON to find Python >= 2.5

On OpenSolaris /usr/bin/python is 2.4; use AM_PATH_PYTHON to find
a newer Python. (The PYTHON environment variable can also be set
before running configure to override the search.)

http://bugzilla.gnome.org/show_bug.cgi?id=578196

diff --git a/configure.ac b/configure.ac
index a99f6b5c562ce3eaf03293d0eb2927e8e105096d..83ea03ff92ec2ede9c32d55bb9b9e7fb5a1312d6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,10 @@ AM_GLIB_GNU_GETTEXT
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 AM_GCONF_SOURCE_2
 
+# Get a value to substitute into gnome-shell.in
+AM_PATH_PYTHON([2.5])
+AC_SUBST(PYTHON)
+
 # We need at least this, since gst_plugin_register_static() was added
 # in 0.10.16, but nothing older than 0.10.21 has been tested.
 GSTREAMER_MIN_VERSION=0.10.16

diff --git a/src/Makefile.am b/src/Makefile.am
index b85528768bd15e26afb027815cf06b1a5de86e72..9dd9ff8eba61b270c5c46a12c6e1ddb9720eeadd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,7 @@ gnome-shell: gnome-shell.in
            -e "s|@libexecdir[@]|$(libexecdir)|" \
            -e "s|@libdir[@]|$(libdir)|" \
            -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \
+           -e "s|@PYTHON[@]|$(PYTHON)|" \
            -e "s|@sysconfdir[@]|$(sysconfdir)|" \
            $< > $@ && chmod a+x $@
 CLEANFILES += gnome-shell

diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index a9003a39ac7e31d5f90ab310c456fdcd87d3a972..035ccd3e4b2960780dee363b2c270dd820793852 100644 (file)
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!@PYTHON@
 
 import atexit
 import optparse